fix(java-enum): resolve enum methods from enum_body_declarations#984
fix(java-enum): resolve enum methods from enum_body_declarations#984sahil-mangla wants to merge 7 commits into
Conversation
Java enums with methods (e.g. isWeekend/label in cp_enum_method_java) have their method declarations inside enum_body_declarations, which is a child of enum_body — not a direct child of enum_body itself. find_class_body was returning the raw enum_body node (16 children: enum_constant×7, commas, and the nested enum_body_declarations). As a result, extract_class_methods iterated enum_constant/comma nodes and never visited any method_declaration, so no Method nodes were created and no CALLS edges resolved. Fixes: - find_class_body: if a body resolved via field-name lookup is enum_body, look for enum_body_declarations inside it and return that instead. - find_class_body fallback loop: same unwrapping for the type-scan path. - push_class_body_children: add enum_body and enum_body_declarations to the recognised body-container kinds so the walk_defs stack correctly scopes enum method children under the enum QN. Tests: convergence_probe 47/47 passed (was 46/47, cp_enum_method_java was the failing case). Signed-off-by: sahil-mangla <manglasahil2017@gmail.com>
Wrap two if-conditions that exceeded the 100-column limit: - Line 3506: break &&-condition before the parenthesised ObjC/Java language check so the line stays within 100 cols. - Lines 5860-5861: split the combined enum_body / enum_body_declarations comparison onto separate continuation lines to satisfy the limit. No logic change; formatting only. Signed-off-by: sahil-mangla <manglasahil2017@gmail.com>
DeusData
added
bug
|
Thanks. I have triaged this as a 0.9.1-rc Java extraction bug fix. Review should verify that enum_body_declarations handling fixes enum methods without changing normal class/interface method extraction or introducing duplicate method definitions. |
|
Thanks for splitting this out of #893 so quickly — exactly the atomic shape we asked for, and the |
Signed-off-by: sahil-mangla <manglasahil2017@gmail.com>
… receivers Limit same-module suffix fallback in resolve_same_module to only fire if the receiver is a self-receiver or matches the module/namespace. Also reject matching dotted/colon-qualified callees targeting a Function to a different prefix in name lookup. This prevents false-positive recursion flags on store/delegation calls. Signed-off-by: sahil-mangla <manglasahil2017@gmail.com>
Signed-off-by: sahil-mangla <manglasahil2017@gmail.com>
…e conflict in extract_defs.c
|
Thanks for this, @sahil-mangla — the Java enum-method extraction fix is genuinely good work, and the One blocker before it can land: the PR also carries an undocumented change to the call-resolution core — Could you split this into two PRs?
Really appreciate the contribution — just want each change reviewable on its own merits. |
2 participants
What does this PR do?
Resolves extraction and calling-edge issues for Java enums that define methods (e.g.,
isWeekendorlabelincp_enum_method_java).In tree-sitter-java, an enum's methods are declared within an
enum_body_declarationsblock, which is a nested child ofenum_bodyrather than a direct child of the enum declaration itself. Previously:find_class_bodyresolved only the rawenum_bodynode.extract_class_methodsiterated over this body, encountering constants and separator tokens, but missing the nestedenum_body_declarationsblock. As a result, method definitions were ignored and calling edges failed to resolve.This change:
find_class_bodyto correctly scan and inspect theenum_bodyfor nestedenum_body_declarationsnodes and return them.enum_bodyandenum_body_declarationsto the list of recognized body containers inpush_class_body_childrenso the AST traverser pushes all method declarations under the correct enum QN namespace.extract_defs.c.Checklist
git commit -s) — required, CI rejects unsigned commits (DCO, see CONTRIBUTING.md)make -f Makefile.cbm test)make -f Makefile.cbm lint-ci)